server: Fix exception while update domain resource count (#3204)#3304
server: Fix exception while update domain resource count (#3204)#3304DaanHoogland wants to merge 2 commits intomasterfrom
Conversation
|
@ustcweizhou , i redid your PR because it wouldn't fwd-merge. |
reimplement 3204 on moved file in 4.12
DaanHoogland
force-pushed
the
reimplement3303on4.12
branch
from
1bb64e5 to
044429c
Compare
|
@DaanHoogland ok. what about cherry-pick ? |
|
@ustcweizhou same conflict, this was quicker |
|
@DaanHoogland you could have forward merged with this change? |
|
@DaanHoogland can you also check the Travis failure, is this breaking anything? |
|
@DaanHoogland @ustcweizhou the build fails due to: Please hold merging until build is fixed, thanks. |
|
|
||
| private long executeSqlCountComputingResourcesForAccount(long accountId, String sqlCountComputingResourcesAllocatedToAccount) { | ||
| try (TransactionLegacy tx = TransactionLegacy.currentTxn()) { | ||
| TransactionLegacy tx = TransactionLegacy.currentTxn() |
There was a problem hiding this comment.
@DaanHoogland you missed ";" at the end of line 269.
|
@rhtyd fwd-merge did not work due to the file being moved (out of git bounds) |
|
@blueorangutan package |
|
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. |
|
Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2751 |
|
@blueorangutan test |
|
@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests |
|
closing, setting |
|
Trillian test result (tid-3570)
|
6 participants
reimplement #3303 on moved file in 4.12
(should add the fix from #3204 to master)
Description
Types of changes
Screenshots (if appropriate):
How Has This Been Tested?